Backward compatibility update