Added ability to override (extension) the Core Class