Fix shim, add initializer