Added support for items limit