Updated initializers