Support for single-function modules; dependency list working again