Add stack and local limit computation