Make dependency on base less strict