[WIP] Allow a more dynamic mapping for dynamic templates