Add security hadling