Following a new class design pattern.
Fix regressions.