Changed code to force arguments on various constructors