Added security support