Do not delete if not persistent
Refactored all the features