Add 2 push buttons support