add pagination & delete internar reference to other services