Added more to map