Fix relational mapping