Move creation of default values in he class files