Added some core functionality