[TASK] Improve advisory import