Add save path and extra features