Updated domain classes to include relationships.