Add limit handling to wrapper