Make demo more generic