* Fixed context issue for implemented classes