Added needed (although unused) modules for working install