Update entities to create correct attributes with proper entity values.