Refactored using extract-class on dashboard type.