Use modules to initialise demo-base where possible