Removed some NotImplementedExceptions