Added stub classes to keep backward compatibility