Adds new button support