Add some more functionality to Plan