added extra data for the remaining types