S4 classes and methods are defined, functions have been updated.