Can you leave these types as-is in this module? These are meant to mirror the types as found in sundown's library.