Added some core classes