Refactoring direct GenericBuilder build without UnsafeVertex