Added some core (and empty) classes