Modified for object relation mapping