Add 'stop' method
Recategorise API calls also in implementation