Include more types, make things work in node