FEAT: Adding diag for all backends