Fixing a bug
Moving next of kin information to separate table