Updates to support folder directory