Added back primary and secondary id's

- Added back primary and secondary id's