Make samples more generic