Changed demos to use types not structs