Update Router system (more flexible)