Added order by and filtering capabilities.