Improved device registration