security-manager: more integration