[Parser] More clone updates