Better data to map