ENH: infrastructure classes added, ..