Address Issue #1 and #3 for content buildout