- Add event paramenter
- Implement Paging control