Added the classes from the provided code