Revert "Revert "Dynamic Map Creation v1.0.0.2""

This reverts commit 81dea959a23e598a57dc3a3238f1c92896b9bffd.