Base endpoint definition

Fixes #461
Just realised I've failed to be consistent within the definition itself :-)