Fixed store and persistence functions