Modifications related to in-memory and permanent db code changes