-Add relationships, fix field to work with unittests