Little change for backward compatibility