Adding support for multiple buttons