Added tab completion support