Update for backward compatibility