Added class references to parameter and function definitions