[MODIFY] replace Object hash to Map in Expander