Add suport for multiple devices