Added some essential modules and turned on dot-expansion