Modified initializer