still need to check tpe and set proper enum for source and measurement
type