Add some new gems and implement paginator