Updated reference generator