Improves tab completion support