add VDI optimization; add support for directories containing whitespaces in their name