Added code for traceability