Adjusted function calls for installer