Implemented persistence feature