Add demo content
Refactoring