Make demo more complete