Innovation And Productivity Analysis With Heterogeneous Firms