Added injectable persistent data handler