Expose Maps via template expansions
Add register declaration