Is this work to be done in another PR? Or to be taken from config?