Improvements for Label