Now returns device JSON representation instead of device ID only