Updated POM and domain classes