Finished adding type signatures