First version for new dashboard states