Maybe this should be a conditional dependency?