Complete ORM mapping
Moved to internal libraries