Updated to using types.