Core: BaseClass added