Track only if required