Fix last commit. Would help if I added the new classes.