Refactored with named routes