Fix data type DSL and simplify map updates