updated namespace & routing