Improved and corrected domain classes.