Added limit and pagination/offset functionality