Revised ClassLib