Added support to "directory independent"