Fixed #1 managed Map types