Change to support XMG