[Enhancement] Adding shim support