Added clone/update support