Improve backward compatibility