Improve Persistence option and callback management