Updated the code and schema to work with the new version of Songbird.