Removed hard-coded base_frame name, improved memory usage