Make Controller use Controller Type instead of router output

Fixes issue #173