updated changes for relational mapping