[IMP] Add unused variables