[FEATURE] Improve data type resolution