Using query builder

Instead of build object in one go