D3.7 Optimised Traceability System