Replacing new API files provided by Steve.