Added security handling