Trying to make the dependencies shallower