minor change on aws api
Completed aws module
Resolved conflict