New version

Added pagination support