Feature/abstract related models