XD-647 General cleanup, added custom converters hook