Removed unnecessory generator class. Logic moved to serialisable classed. Also added ability to retrieve the domain model.