- added : entities generator and helper queries