Added classes to domain architecture