This class will be removed soon!