Types renamed and functions added.-