Updated label functionality