adjustments to work on both hosted mode and AS7, integration with other components