Create Directory feature - fixes