Added dashboard model and updated queries