switch modules to builtin
add additional modules