[~TASK] Refactoring ORM