two classes temporary restored to fix backward compatibility