Adding some typescript