Added Span support in some places already, and changed Nullable to annotations to declare intent to enable nullable at some point in the future
