Added parameters to initializer