Add some comment/attribute support