Revert back to Routes object instead of group
Small fixes