Now only assigning values if they are non null.