Added local and remote hybrid deployment mode