Changed for remote deployment using cargo