Added Primary Key to classes