Added domain classes