Updated type signatures