Improve fluent helpers
Refactor add routes

Comments can be added to a variety of objects, refactor the routes to better support this.