Added routing and resolve