Added more copy support