Added setters for persistent storage