Added nullable annotations