Added map of primitives to dataset to make search by id faster check if primitive already exist in addPrimitive and removePrimitive use PrimitiveId instead of id + primitive type