Started to work on dynamic directory support.