Adjustments as per feedback from AWS developer