AWS functionality added