Add limit parameter
Basic language support