Added support for new policy creation and instrumentation