Refactor domain info builder