Components refactoring and score management