Added secure functionality