More handler refactoring.
Merge branch 'JP'