Adding garbage collection