Support more record types

NOTE: We'll need to revisit this post IH.

Closes-Bug: #1290446

Change-Id: I187f6d8b7dc75175b402cfd89594087c4f3dba7e