added aws factory