Switch to hyphenated and name-spaced placeholders
Add list-maps mixin