More changes to constructor