modify some class to implements Cloneable