Add AWS customizations