Improve the get traceability