Updated initializer code