Changed the schema to include a wasObserved data member and changed some of the data members to objective c style