Support Map/Properties return types