[Enhancement] Adding shim support fixes #4