Add support for nested maps