Added support for more buttons.