Added support for Button and Label