Add some more type signatures