Work on beta adding new capabilities consistent with lambda