Greatly improved (simplified) the schema
Greatly simplified schema and added revisioning function + trigger