Amended some types