Adding support for new omit-first-directory option