More integrations converted to the new style