Added infrastructure classes.