Added name and folder