Improved label management