Added extra-data storage to buttons