Added aws cli. Refactoring