Further work on common library classes.