Added security handling.