Added labels, refactoring