added tabs support