add NotImplemented handling