Added more obvious feature-set to plan