Changed Serialization to not serialize null properties.