add material class, change geom for private members