Fixed the content writer to write the correct values for Value and Non Value types