Core modifications for the new V5 client