Updated executor to mark resolve names