updated Domain classes