Update mixin to allow multiple devices