Added pagination to class domain & range properties