Removed hardcoded primary key