Added Relationship types, added OO-stucture