PDIO-262 Changed to in-memory version