Updated model with S3 credentials