Feature/dashboard support