Complete routing component and add resolver