Adding some more shims