Added some more type specs.