Update to aws-1.1.2 and refactor to match other stacks.