fixed core classes return types and return optimization inside ActionContext