Trying to improve security