add support for persistence