Perhaps put this in its own config?