Update router with objects
Merge pull request #15 from MSchip/feature-branch

Update router with objects