Some attemplts to improve visiblity.
Added s3 schema
merge.