Complete rebase on SimpleDB::Client