Replaced autoloading of all function definitions with an on demand loading function