Updated to reflect upstream API changes.
Removed unused import statement.