Improvement on dashboard backend