Refactoring for custom support. Not sure if this works.