Added shims