Added support for tabs