Added arguments, classes, and helper functions.