Added more variables to tab component