Added support for new buttons