Support overriding stored version