Fix for overrideing core classes