* Refactor support for integrations to drop custom unit conversion * Fix lying comment * Address review comment