JAL-3851 re-engineering endpoints as separate classes