Added plumbing for handling XP.