Changed id's to identity fields