security-manager: Improve integration