Added support for circuits tab