Added sorting and pagination as extra features