Replaced deprecated types.