custom config for a few additions

Change-Id: I66fb5940db9fa88540bbee5bdffc7c9aa0d1259d