Updated engine to use new classes.