Updated some things to the new api.

Added new fields in the Devices class
Removed things no longer supported, and deleted the Extra class.
Clarified some method descriptions.