Changing constructors.
Still need to make some decisions with DataModel constructors.