Moved EntityBuilder to BaseRepository instead of BaseCRUDRepository