Updated Power to support combined units