Make multi-device compatible