Improve types.