Architectural refactor, pagination, client detail