Manipulations refactoring.
Field refactoring.

Bug with extension was fixed.