Removed unnecessary package
Added SimpleDB support