Adjusting logic for label rendering

I want to bring a required class to the label property. This is a step
towards doing this.

Relates to #20