Improve security

Improve security