Hmmm, why do we need to add this to the context? Can't it be part of the command itself? Besides, this is instance variable that's only used for a subset of cases, when x-site is enabled.