Improve paths handling and strings concatenations.