Feature/aws 2013 api support