[PATCH audrey] Detaching dependacy to IF