Adding LocalGeometry and LocalMaterial for performance. see #30