Refactor DiscoInfoGet