Some modification for deployment