Created some additional core classes