Restoring support for [] and maps