add XP mod handle, refactor