Various infrastructure changes to support new skadi_v1 api