Got rid of separate dependency specification, split shim into shim and
request