Changes for aws