Added pagination support and events