Planning for Choices and Changes