added some Core classes + fixed Extendable