Updated and simplified security utility