Improved memory consumption