Add polymorphic commenting mechanism