Converted to type aliases. Don't know if it helps me at all, honestly