- Added scalable endpoints
- Reorg of code to avoid code duplication