Changed to serving from an instance of a class.