added limit support