Added type notes