Fixed NotImplementedExceptions