Adjust calling of function to new modules