Finished adding limit support