Refactored code, added transit map for specific destinations