Made some fields required and unique