Adapted operation to the last core refactoring.