Added optional attribute value support