Router - added prefix support