Clarified analytics
Added missing atomic schema
Merge branch 'master' into feature/improve-etl