moved to one class for both domains