Fix ORM errors
Merge pull request #14 from FallenShard/bart-dev

Fix ORM errors