Remove ObjectMap and ArrayMap and use std Map instead