= Abstract We present refinements to the BEoRN framework, a semi-numerical simulation suite that generates 21-cm maps of the cosmic dawn and the epoch of reionization. The refinements include a self-consistent treatment of the evolution of individual sources, which allows for a more accurate prediction of the 21-cm signal. We validate the refined suite against ?? and quantify the gain in consistency resulting from the more accurate treatment of the sources.