changed type to Map and List instead of PersistentArrayMap ...