Implementing a bypass parameter and updating some class definitions.