Issue #3184092: Use Configuration instead of a table for mapping

Closes #3184092

This mr includes the changes from both !1 (closed) and !2 (closed), in order to resolve the conflicts for our implementation.