Include hardcoded tunnel mode attribute in porposal, remove ESN attribute