Some changes in devices custom management.