Add initial aws support