Add support for typescript