Add basic routing support