Refactoring add classes description