Adding core classes
Adding core classes