Improvements to domain management flow

Improvements to domain management flow