Bring in some more Goodies

Change-Id: Ie7ac5752726d2e53698263f763a343cc074ed787