Modifications for deployment