Added filtering and pagination