XMG related changes