Refactoring
Add conceptual model diagram