New classes to porperly pull from new API