Few updates, change to nullable value/reference types