Edited constructor for domain classes