Added support for badges