fix(core): Adopt to executor changes