Some improvements in Demo class.