Add handler/routes, use hosted resources, update xpaths.