Added type signatures