Services updated, errors in endpoint class fixed.