Changed tab completion method