Update constructors, remove Optional, add non-null