Implemented simple loader, Improved endpoint handling