Manipulate domains refactored