Added missing limit support.