Added XP extractor