Add lambda and block support