Changed relationship, added Server class