diff --git a/Dochi/Compile.hs b/Dochi/Compile.hs
index a407cd9..d070d5a 100644
--- a/Dochi/Compile.hs
+++ b/Dochi/Compile.hs
@@ -124,7 +124,7 @@ findModule name = do CompileState _ e u <- get
                        []  -> throwError $ "Unknown word " ++ name
                        l   -> throwError $ "Conflict: word " ++ name ++ " in " ++ (show l)
     where f u = map fst . filter (elem name . snd) . filter (flip elem u . fst)
-          defaultModules = ["core"]
+          defaultModules = ["core", "list", "table"]
 
 
 compileAST :: AST -> Compiler ()
diff --git a/Dochi/REPL.hs b/Dochi/REPL.hs
index 9bf692b..bbdebe6 100644
--- a/Dochi/REPL.hs
+++ b/Dochi/REPL.hs
@@ -56,7 +56,7 @@ completion opts st str = return $ mapMaybe f $ filtered ++ all
     where f k = if (take (length str) k) == str then (Just k) else Nothing
           filtered = concatMap snd $ filter (flip elem modules . fst) $ environment st
           all = concatMap (\(m,w) -> map ((m ++ ".") ++) w) $ environment st
-          modules = ("core":current opts:using opts)
+          modules = ["core", "list", "table"] ++ (current opts:using opts)
 
 
 runREPL :: Options -> ChiState -> IO ()