Changes to initializer