Add Support for Values to Buttons