Add code to pass through limit and counter