Added geomfx which handles generic geometry with mups