Moved extended code into core classes