Added improved tables and garbage collection.