enable more useful formats

Change-Id: I790f0678a0fb06b3fd1babf499803b5250f23c1b