Added uncommittable settings
Added S3 storage adapter support