Made some changes to improve the primitive extractors speed and results on the new metaroom data