Allow certain keys to be nil
Bump version and complete marshaling updates