Added a few wrapper-classes.