Added Clover class system