Refactored and improved extension methods for domain interfaces/classes