- Rewrote the gather metadata functionality - more performant now