Added support for tags for buttons