Improve the security