added AWS-specific type params