Adding some currently unused changes that may be used in the future