Further worked on DeviceDB