Add support for buttons