Several improvements
Improved management