Add special case for Athena client