Added City and Country Domain classes