Updated functions class.