Switched to NotImplementedError - was missed in previous refactored. Has been updated