Add pagination & some features