Added XP support