Improve formation management