Update to allow properties to be null