Additional API requirements fix