Updated to initializer list