Improved memory footprint