Add function to check old pipeline
Handle scalar components as per new pipeline