Added user name check and folder flexibility