Add cloneable objects and comments