Refactored as product plan