Refactored labels mechanism