Built support for expand dir option