Added in router and device class so that we can have that information.