Updated with latest ee jar snapshot