Domain classes modifications