Module Updates + Performance Improvements