Improved skill management