Improvements based on CFE's team feedback