Change functional calls to class.