[WIP] Fix parsing of nested maps