Added more core classes.