Added type option for sensors so that sensor names may be generic