Modifications for remote deployment