Moved AWS functionality to separate class