Repair the demo module to work with OOP