So I will update the gateway to use Enums and switch. Once the AWS goes GA we can then look at refactoring ARFOG (Session in particular) in a separate JIRA to let s3 gateway extend from it. WDYT?