just some minor changes with Amazon related classes