Changed setup of telemetry and path attributes to check the type and process as appropriate