Modified and exported Domain Model v1