Improving labels validation
Updating documentation