Unused imports and @NonNull on primitive types
Add major and minor to Beacon