Added tab handling