Improve security part