Add multi-configuration

Change-Id: Iccf207a591b68021976f642c17e39e64b5de0700