Updated initializer