NotNull annotations and checks.
Fix mappings initialization.