Handler security added