Added support for XP