#41 Add @Id annotation for master key attribute