Added polymorphic commenting capability