Making changes for JWT