Added disclaimer, persist_metadata; fixed rename bug