Add plan to comment and add route setting