Improve peristence and callback management