Add router and category support