Added nested Map support