Face and Vertex classes added