Updates to reduce memory usage