Feature/aws cli