Replace new builder by models manager createBuilder call on model queries