Only set data property when appropriate
Update README