Temporary going back to previous NMS storage methods.