Need more attributes exposed for Tim.