Added garbage collection system