Added base infrastructure for comments