improve ORM component