[~TASK] Improved ORM framework