Add pagination and fined