Add: Device, Property. Update: ZsFactory