Added support for multiple devices per user