Refactoring: directory options added