change aod comment implementation to LinkedHashMap