Changed to object
Added IdClass annotation