Improve Movable and Attacker services