* Improved memory tracking