Add security measures to prevent problems