Refactor of nollum with route definition fix