Adding support for more complex geometries. Need to fix TPV205 and periodic problem for new structure