Refactored WayGetter