Code refactoring to make it easier to support new data types

As described here: #12565 (comment 213292271) we need to implement code changes to make it easier to support new data types.