Refactor of IF for device management DB