Refactor plans templates