Added support to tab expansion