PIM-3360 : re-work repositories to get ride of custom base entity repository