Improved Automated Traceability for Assurance of Safety-Critical Systems