Short todo note
Added AWS support