[~TASK] Rafactored ORM