Added folder mapping option