Improvements to accommodate new incoming features.