Adds limit management