Added AWS class and ImageSelector class