Added still more type and rating data