Adding policy management components