Refactor Host to use the new Map class