Improve types