Adjust edit method
Refactor status for domains