Align to v5 diff signature changes