Development

Added new classes and updated relations.