Adding labeled view support