modified relationships, added some services class