PMD code checker changes
Merge in endpoint call code