Don't call query, command, interactor from old_* anymore