Add auto generated primary key annotation
Fix mapping typos