Reorganisation - Add cursor management changing