Improve formationManager