Items now added to map instead of list