changed routing to fluent API