Cleaned a bit the ValueFirst provider