Added nullness annotations