Support to provide dir name, complete callback and various other changes