Finite Diagram Geometries Extending Buildings