Support more flexible deployment configuration