changes for mapper registry storage