Add missing routes and builder