Completed legacy integration