Added additional security feature