Update for new container structure
Update for service_type URL