Improve ORM mapping