Adding typing information, still hacky