adding persistence support to manager with better api