Fixed composite primary key, added one more column.
Fixed invalid field names in annotations.