Add population and pagination