added initial support for auto shim