Updates to better handle TAB character