Add legacy integration support