Refactoried LabelService
Commit merge