Added shim layer