Add limit support