Added accessory text/label handling