Yes, that's part of the refactoring work @rich-nguyen will be doing.