Added more domain abstractions