Made examples more flexible