Added more modules

TODO: Figure out a good way to not use the “osx” module in Linux.