Added support for Button and ImageButton objects