Committing for great justice
Altered Router.java to correctly encode service data