PDIO-398 More instructions for Storage layer