Added callback ability for router