addressed comments with exception of route resolver