Added control on device registration