Improve ls behaviour