Reconstruction part now handle all geometry options