Maps are replaced with ListMaps

Again, that's a huge readability improvement