Added shim support

wip