Improvements to the Map data

1. Also creates all the equipment now without complaints.
Bug fix in Equipment
Refactored the Serving class