Add some optional
Change route name
Go on with optional table defs.
Check needed import and from + add conditions