Improved memory menagment