This should be a separate PR as it is a separate feature (and I don't really see a need for it)