Improvements to domain and principals