New refactoring of amazon API, workinprogress