Enhanced ClassLib