Updated Domain Classes