Changed token getter to be on demand.