More refactoring for dashboard support
Merge branch 'dashboard'