Working on ORM
Fixing issue with js include
Add reference to dataManager
Fixing logic issue