Feature/aws customize