Fix broken dashboard
Improve generics