Added skill tracking
Refactoring