* Annotate all data model fields with @Nonnull where appropriate.
* Change the type of variant id from String to int.