Cleanup - in preparation for ESI

* Optimizing to use Title instead of Output object
* Added getConfigId()

Change-Id: Ifd588d87eaeb1e243a2b8b28bc1ad26c2ce16d66
Merge "Cleanup - in preparation for ESI"