Merge pull request #9 from pbl-cloud/orm_refactoring

ORM refactoring