development: Updates for labels