Started refactoring plan construction