Improve type specs