Add support to MultiGeometry
Code cleanup