Refactored plans