Add support for other buttons