Fixing issues with tabs
Fixing missing import