[220] Added again the previous API