More infrastructure for storing registry