Add new version of shim and velocity