- Move constant used in only one file to the same file
- Make typedefs for addon data fields non nullable
- Remove unnecessary spread operator