Removed merged changes from feature/primary_key as it had not been tested properly