Support limit and key/value options